Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 3 Feb 2012 20:37:10 +0000 (12:37 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 3 Feb 2012 20:37:10 +0000 (12:37 -0800)
commitf33489ad368f73f484f11079702a6d747a5a02e9
tree28ecb3404019fdc4fdb48096a93e66314c9def1b
parent2a6fe7a7d6ab4e866f77ab7616ed7436ef35661b
parentde14753345c808b4eef2cdc16252dfb247683204
Merge from trunk.